Merge "Workaround for a database update callback that claims that the data doesn't exist."