Comment 6 for bug 1781176

After a quick discussion with Balint, seeing that this is an incomplete fix but without any reverse effects and introducing no regressions, I have decided to release this version as-is without the need of removal of the changes. Please re-open the bug after the package lands in -updates and fix it properly with the next upload.