Revert "Switching organizations prompts for the space when it's not provided."

This reverts commit 0c5bdacf89f93b43b8c27b6f8c65ef68b7d648a9.
It was broken :(