Revert part of the last commit