Unbreak domdiff yet another time!

Change-Id: I78dbc25644cce24fc62889c4e25e41dac0cbaaf1
Merge "Unbreak domdiff yet another time!"