This reverts commit ce6f6037. Reason for revert: TF fix has been pushed to prod. Change-Id: I2e91c87b19ab174809aee347d6620a65a8963bdc