revert some wrong changes