Merge "Revert "Revert "Fix the web updater"""