Merge "Updating user restrictions when they are removed" into nyc-dev