Revert "Cheap performance increase on service list view"

This reverts commit 4503e12cfbfd9977e01214e8b3eb744169af10ef.