Master

Nick Langridge provided a patch for the webcode that means we don't need this hack in core any more.