Revert 1b53a67..03dc72a

This rolls back to commit 1b53a67548a721e347e8668f1e77f2271c7b7449.