This reverts commit 1897c352f5 on master. This is a mass rebuild that should go through staging.
1897c352f5