Revert f1018ce..64ac7d3

This rolls back to commit f1018ce4fef8ed9361973f7bce69d67a594f0ea0.