Reverting back FirstNEntriesInRowIterator and apply last patch