OC5 and master are broken - right? -> fix it
The rewrite is too far away from my understanding.