Don't ignore global noop when updates are enabled (2nd try)