revert #2598 to instead commit to staging