Revert cd8cbea5a4c31fbabb25075038a202577263c39b due to broken build.

That change is only applicable to macro-paradise but not to 2.10.0 /
2.10.1 targeted by master.