Merge "Remove check for an impossible condition"