WIP Make diffs work with removed content

Change-Id: Ifc3823e9fd2db18533289c7cda45e7d5450440df