hack in cdiff support