Revert ba12dee..c22bcbf

This rolls back to commit ba12dee1b52169656c94c2c922b14c8d1e4a5d60.