Revert hpoussin's commit in r29960 to unbreak build.