revert rebasing with sourceforge upstream crengine