Revert 4632e1a..a91367f

This rolls back to commit 4632e1a875a009b5a99f244c37e4e79e4c0172b3.