Merge "Revert "Treat everyone the same."" into nyc-mr1-dev