TP6: Partially revert the previous commit.