Restored logic swallowed by merge