You can try this version (see attachment).
It's the 2.0r29 with the changed lines from my post above, and just increased the version to r30 so it will load ABOVE all older ones in subfolders etc.
And yes, basically this is all you can do (as we did as well)
