Eliminate short-circuit and restore update-suppression

Short-circuit would never work with the instance override since the setting would be usually identical anyway