Revert " Merge issue with previous itest update."

This reverts commit c9fa94ba8b285470a2777e18b5077278b3c2a975.