Bug 17100: Restore previous logic