Comment 2 for bug 1776252

Change abandoned by Emilien Macchi (<email address hidden>) on branch: master
Reason: The gate is having serious troubles with, we need to abandon this patch so it leaves the gate and when it's stable again I will restore this patch. Please do not restore or do anything, I'll take care of it as soon as things work again.