Revert 2 commits (by hands with tortiose)