ecb102e442
It caused test failures during switching between master and t4 branches, also could cause other strange errors.