Comment 13 for bug 1584977

I have just tested the patch on Linux and it seems fine. I think it needs testing on other platforms as well due to cascaded #ifdef section, though in my opinion the risk is rather low.