Revert "Fix for Corrected Aftermath for July TP Changes."

This reverts commit 7bb1ece564775ff8c9d8271eb4ab38578bf034da.