Revert d3ef590..9a734f2

This rolls back to commit d3ef590942922d3059cd5a24613d92f2e112745a.