Revert last test commit

Change-Id: I1afc7bc8b59eecf26a434e130441b343d4ffc2c0