George updated the Diff but I didn't noticed until it was too late. (cherry picked from commit bbc0ec57)