Revert "trying to fix weirdness that might've broken staging on last push"

This reverts commit bc27d8d1bc8940fb1326d0536f2cc1244fb9285b.
manually undid the random changes we made messing with staging, since git revert isn't working