Revert 39671a9..c17b953

This rolls back to commit 39671a91882b52ed58058c86d75f28e0d4e1e6cc.