Revert cd1cf9b..9f55500

This rolls back to commit cd1cf9bade3d5ae48abf947aa7005164c8134e22.