Let me know if the hack works for you. Then I can help submitting a proper patch to upstream. Or if you need more assistance, let me know, too.