Merge "Revert "Don't enforce this API - it's not sensitive"" into nyc-dev