Close this bug until we have a simple and upstream friendly fix for this, patching all things are too complex I think.