Revert "tr again"

This reverts commit 6a3007fcfa942799369e6a359cd82a4905682a69.
Revert "remerged stuff"

This reverts commit efcf85ed29e0b864dbee0698a67ff6151a62bc9b.