Revert "Admin Room/Syndi Shuttle update - Merge Conflict Fix"

This reverts commit 86416d7fb3124cc845dd906e50feb9f35d0756a0.