Re-enable the piece of code which needs the old TP