Merge "Revert "Throw for unknown user restrictions.""