I'm with @ADmad on this. Removing this and `javascriptend` is dangerous, we don't know if there are applications in the wild that rely on them. With that said the add on line 101 seems reasonable.