Revert my commit in r261253; the real problem was tackled in r262209.