Revert "Making sure org membership is uploaded before picking the admin spoof."

This reverts commit 833848c32a894134d5e1f74bc701dcbd549f1840.