094bfcf237
This reverts commit68eb95705f, reversing changes made to347a238ef8. Moving the big rebuild to staging; original PR #249136, revert #251367