Revert the Revert to a Revert
Fix downstream