This reverts commit ee8e15fe76a235ae3583d4e8cb4bb370f28c5eae. See discussion at ee8e15fe76.
ee8e15fe76