Revert c58c82b..6e33f68

This rolls back to commit c58c82bde48a91315d26b46360512afd4a479fd5.