Merge "Revert "Don't use file ID of the removed photo"" into nyc-dev