Revert 0ae93bb..f391f95

This rolls back to commit 0ae93bbca5803200a0cbd8383fc7b7f9f80c5664.