CBLT-252: UNDO experiments, restore commit:  7ffc5616805cb783bec7b5d6bb92636c7fc462c8

Change-Id: I5d6ffce9824f9421a7351bc4a77b1faff3454bff