This now covers also changed documents correctly and just discards the
changes.

Change-Id: I75f36cf6874782eaf296bad42974f4a03f55eaa5