Revert 6a16f72..6790b55

This rolls back to commit 6a16f723b42dc1a12c98b5d2d1e3a79b45eb0964.