[tor-commits] [tor-messenger-build/updater] Back out some of a82a7c1b