revert 1.5 stuff
compatibility with NoScript