Revert d3dfafb..ef9221a

This rolls back to commit d3dfafbacbc11b2c22fde391a0301506691de2e5.