Revert Gallio/MbUnit changes in e899a861ef117801ab18bade3f3b250312c6ca15