Issue #2225809 by robertstephens: Use proper API for registering wizard classes