Revert "TSB fixes 3"

This reverts commit b416311b68894f95f316ccf3e0e88ff621fc0294.
Revert "TSB fixes 2"

This reverts commit e27762c2d27aec63cdbc075bedad934b73f9d12e.
Revert "TSB fixes"

This reverts commit f9cbc3b5c22892f1ce24e1c8b2f819d8c70274fc.
Revert "TSB 1/2"

This reverts commit 5ffd5d8ad71e60f7eec55b0a7c33f3590e355d85.