Revert "no idea why the ListBuffer makes us throw that error"

This reverts commit 09f9a85dacb2efee11fdfa887e406c0c5861bf98.