Yet another change for git migration backported from trunk.