Partially revert commit 8ae9632c7edae1afc34d63fdf763fc7bd6831e1e

May fix issue #348
Upgrade version number to 3.0.0 RC 7