Revert "roll back optimization that behaves *very* badly for LinkedLists"

This reverts commit e928d2a4de8a1c11642553decda5ea20ce1460db.