This reverts commit 1eb13643. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706.