Reverted PR 825

[Wilder Rodrigues]

Guys,

Unfortunately, PR 825 broke Master. Due to that, Remi and I just reverted it.

@Boris: please fix the error and reopen the PR.

Cheers,
Wilder