Commit 60f2eee18fcaff9bd6983122f15e71afa79ab46e

Stefan Sperling 2018-07-08T17:18:45

undo previous; too much mixup in one data structure