Revert ca819f6..0f32c52

This rolls back to commit ca819f6760d2a72305200c795992a4f73e308364.