Merge "Remove obscure check that was always true"