I have a patch in my overlay and I reported it upstream; I'll wait to see what they think first.
Fixed myself in 2.4.2-r1.