Glad that's sorted!
I imagine that it may be a good idea to leave this for easy access to those Googling for this problem - but - the problem is likely going to go away as they put that update into the mainline supply.
So - we'll lock or merge this one soon enough.
Thanks for your efforts here, dlin!!