Yes, I do not want to open any cans of worms or create any monsters!
That said, I have created a "fix" and pushed it to master for the next release. Further testing is needed to make sure there are no side effects but initial testing indicates it works.