Revert 3a2ab63..e9b368a

This rolls back to commit 3a2ab6378fff95578f725a30cc2450b23d722b95.