Reverting a dumb change to data collapsing
fixing merge conflict; what a mess