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