This reverts commit d2ab3f50.
The reverted commit turned out to be a workaroud another problem.
The real fix is submitted in PR #5680
Signed-off-by: Marc Khouzam <marc.khouzam@ville.montreal.qc.ca>