Revert "qa/1661: adding some diags to help diagnose failures."
Revert "qa/1661: adding some diags to help diagnose failures."

This reverts commit b612f9c7f3d6c782afa90cb4b182496293ab45af.

Moving my changes asside to avoid merge conflict with Mark's
next change.

adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp