This reverts commit 8eebd694. Reason for revert: TH skipped PS run Change-Id: Iab0e71d985819880146476ba3648e8b94201a839