revert PR#2755: it breaks compilation