revert some changes from prev commit