Restore find kpgd_method2 as a fallback.

Also fixes missing 'case' in switch statement.