Remove a bad, redundant check.

Fixes #279
Incorporate feedback.
Merge pull request #285 from docfaraday/fix_ice_hang_2_rebase

Fix ice hang 2 rebase