This should only have happened in the 5.26 branch, not in master. CCMAIL: jr@riddell.org This reverts commit 137a445f.