Revert "[T5][T11][US6]"

This reverts commit f80126039accdb316de3680e4c412a2f8e26429f.