Issue #2026037 by Crell: Check for legacy controllers based on the legacy flag, not the callable type.