partially revert ec1c19d (breaks userscripts)