Revert e0702e9..c44367c

This rolls back to commit e0702e97da053ee1557592e2253282600fae340f.