Merge "Remove workaround for comparing database domain IDs."