diff --git a/forms/gridfield/GridFieldPopupForms.php b/forms/gridfield/GridFieldPopupForms.php
index 1caac1049..6da5fe8c8 100755
--- a/forms/gridfield/GridFieldPopupForms.php
+++ b/forms/gridfield/GridFieldPopupForms.php
@@ -311,9 +311,6 @@ class GridFieldPopupForm_ItemRequest extends RequestHandler {
 			)));	
 		}
 		
-		// TODO Remove once ViewableData->First()/Last() is fixed
-		foreach($items as $i => $item) $item->iteratorProperties($i, $items->Count());
-
 		return $items;
 	}
 }
\ No newline at end of file