Revert cb45e6a..21830fd

This rolls back to commit cb45e6a7a16259b1e9cab247101d7ae752fd2f54.