[Mono-dev] revert of r104029/30/31

[Sebastien Pouliot]

Gert,

Please *post* your patches for review *before* committing them! 

Those changes were obviously untested since they broke the unit tests.
They also mix formatting changes (not all in respect of mono style) with
code changes (parameter names) making this harder, than it has to be, to
review.

Also note that such *big* changes always cause a lot of conflicts for
the code maintainer(s), since they often have uncommitted code or patch
in testing. So a bit of warning before committing is a *minimum*.

Thanks
Sebastien