Revert 1fce354..d612775

This rolls back to commit 1fce354b7fb707de7aa5386a2f0c37fef8c0d630.