in r546805 Somehow I missed his commit and worked on an outdated tree when I worked on r547341 apparently