This reverts commit 2d39e813fa.
2d39e813fa
could do this on deploy only, but I don't feel like figuring that out...