Broke something using this commit as a diff