Revert "t660_krizvi merge with t660"

This reverts commit 8356b20819598628ecf48fe80bcf3eab012cf208, reversing
changes made to 69a3bd94337d4465530bcfedba7025f32a90ed02.