As requested in #9. I applied the patch. It worked cleanly on 8.4.x Head.
Ple...