Revert cd33f50..d7c1c2a

This rolls back to commit cd33f5032e128debd9b709cfcc5c9f2a5d04081c.