Partial revert for last commit