This reverts commit 68eb95705f, reversing changes made to 347a238ef8. Moving the big rebuild to staging; original PR #249136, revert #251367
68eb95705f
347a238ef8