They are fairly ugly, but this will make it easier to merge
DRI in the future by minimizing unnecessary differences.