This reverts commit 942dbf89c6. Sorry, this was supposed to go to staging instead of master...
942dbf89c6