Revert 761c010..0500897

This rolls back to commit 761c010f4520e3ab01799b71792dbc94ca077bc7.