Revert 053c87c..687c4cc

This rolls back to commit 053c87c778e31f832d86ba06d6b2fab8b6769100.