revert some changes that got lost by a stash apply