Undo commit f531bf2d15

It broke the compilation as expected