Revert 7bcbac7..0cc5206

This rolls back to commit 7bcbac70e88c8850fc949a6d1513151fbe355c2a.