Revert cd4143a..5c76c37

This rolls back to commit cd4143aec3daa59f3e727f742cbb4ade0930f0ca.