Revert "Remove references to xulrunner" again