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