It should be fixed at the beginning of next week (with luck) and should be available at the end of next week when Moodle branch code is updated. I'm planning on fixing this in 2.3, 2.4, 2.5, and in the master branch then the fix is carried forward.
Mary