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

Change-Id: I4771307bae02d0fc2dcebb8037f5af0344659a98