This reverts commit 957371b7172163a50187124cfe6fac3fd0aae106. This commit should have gone to staging first.