Directly pasted from git diff