revert the list/generator optimization, i...