Revert "CTS: Work around CTS differences"

This reverts commit 853da8631ecec263a0d4e63fdb0146188c8813c9.
2 files changed