revert parts of prev commit