Revert a0e9501..04d2d52

This rolls back to commit a0e9501b6c127b88be9041ef4d77ae38bec188cd.