Need a better comment -- indicate what backwards compat rationale prompted keeping the conditional.