This effectively reverts commit c6c08996. Removing due to lack of consensus. We can always re-add it in the future if we decide we want it.