[Save Point] Rool back point, befor entity architecture modification.