Made a whoopsie.  Rocking a half-revert to see what we can salvage