Fix the reverting of the condition and constants data especially when user wants to revert data

Reviewer: Tiff Go

Issue: GCp-9863