Revert e25d27a..46e10ed

This rolls back to commit e25d27a812378624419e73ae7b2b39fb3a5180a0.