Revert "Use super to call parent methods"

Was very broken, changed all mixin class calls to parent class calls.

This reverts commit a72a6e3a364d6e9866eb653e67a1e7eb92893922.

Change-Id: I7ba9952df305454ab0e3e9380daec0a62f094c3c
Merge "Revert "Use super to call parent methods""