Revert "TP7/8"

This reverts commit 146f5cb12b8de27622c75013aa99abff2763656c.