TEIIDDES-1447 rebuilt the reconciler to simplify/remove confusing behavior