Fix #5904

Closes #5904 (closed)

There's a proper fix upstream now, so I can now add a hack fix with a version check keeping it fenced away from all our beautiful non-hack code.

I've not actually run this incarnation of this code - it was hand-typed based on something that worked on another machine, and I added the version check in the web IDE, too. Someone should double-check it.