Okay okat, I lost myself a bit with this reverting stuff...
This should be an 'ok' push now.