This reverts commit e040029. The change has created some problems with the --deployment flag. I'm working on fixing those issues, but they will take time to propagate, so I think it's bette...