Back out workaround for 6870 (causes Fx freezing)