This reverts commit 8c58c44a. This causes a mass rebuild and should go to staging instead before master