Revert a91d457..cdaab92

This rolls back to commit a91d457c923d3c6baea015508670f093d8c7e264.