Revert fix PT_QC20369
This patch reverts fix PT_QC20369 because it was causing some cthon failures.
This patch addresses the cthon issues reported in QC 21010

Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com>
Updated to  ptv3.3.1_rev_3
Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com>
Merge branch 'tp/rev_3' into ibm_next_pt_tmp