revert some changes to reduce number of changed lines