Moving changes to staging, this is a mass-rebuild. This reverts commit e79278e4cd9beeb4cdc0c984913888d93aa06cec.