revert some changes from earlier commit