This had been set in r44508 as a workaround for switch problems.