Revert "t6: some small updates"

This reverts commit 02dfe3c47a0f350b0863f53bed26a1a277d8aa08.
t6: some small updates

Change-Id: I9df7cb2d8ac268fa1a1250aa86d5d9a4c6186fcf
Revert "t6: some small updates"

This reverts commit 02dfe3c47a0f350b0863f53bed26a1a277d8aa08.