Revert 9c6660c..5a2d877

This rolls back to commit 9c6660ce2c12a01039a45d6bc19d38d961f3011e.