icarus: revert change (improvement) to mask() as it wasn't used in the long run