Merge "Revert "Fix the web updater""