SI-8835 Fix implementation of Iterator drop to remove quadratic behavior