Revert ed0588b..64ccf8a

This rolls back to commit ed0588bc95319ab824daa2f73e5edec37aac9d38.