This reverts the updater related code changes. I still might need to
merge Mozilla changes into the code once more which becomes much more difficult
with unrelated changes.

Only helpful fixes for now please.

Change-Id: I67b386d12d03250323cce21f4f65b262ce4abcf9