Please see the patch comment. I reworked my original patch to fit into the TINYPATCH category.