Move this out of the diff.