Revert "unrolled neighborhood iteration"

This reverts commit d468342513169babc70dcd5ab34b9415d4390b9e.