Revert to 18d0cffe9
Updates for new ICEE method