The only non-incidental change is to revert portions of d5b4c116 and 3a9a9043. See d5b4c1162d (commitcomment-7668050)
d5b4c116
3a9a9043
d5b4c1162d (commitcomment-7668050)