partially revert 5ca1813 (breaks userscripts)