This seems totally unrelated to #2201.