Revert and adjust last commit