Revert 3a91042..43b9930

This rolls back to commit 3a91042db9cd28c624313498eb400bd0d2b9f2d1.