revert some wrong changes (last checkin)