Revert 7a90590..ffc45c9

This rolls back to commit 7a905909e3c0fe458e310584df5660f637beee99.