James Cheese 75947a6759 Revert changes from 7b687be ...

Adapted the changes to new class structures introduced since the original
deletion before committing, to ensure that everything compiles correctly.

2018-09-24 09:55:13 +01:00

..

ol

Revert changes from 7b687be

2018-09-24 09:55:13 +01:00