This reverts commit 5d79f9f276. This was introducing build errors in windows. Need a bit more time to check it.
5d79f9f276