Revert "Check for both types and log error if unexpected type"

Revert "Check for both types and log error if unexpected type" #14380