Revert of my revert