am 042fd002: Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""

* commit '042fd00295d21f936ba7a8c16915ce678970e658':
  Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""