Revert 36e9131..d3df93c

This rolls back to commit 36e9131bdd28334ff2b76b6f69ddd5ee6fd88928.