Revert part of last commit