This reverts commit 051b3b3b7876cff28f6815a843f6d4e165299686. This is a mass rebuild and should go into staging.