I think I see the problem. In r/14888 Justin reverted a change at r/14859, but the relevant line is now commented out again in Melanie's merge at r/14892. These "merge branch masters" often introduce a lot of changes and seem to cause a number of the more awkward to diagnose issues with reversions of changes creeping in.