This reverts commit 7d46f736. This change was accidentally commit to master. To avoid a mass-rebuild we actually apply this change on staging first.
