OK, I pushed the workaround patch to stable branch, while asking upstream about a more proper fix (if any). Let's see.