Don't require d2to1 anymore

Change-Id: Ieddb451b2308262ba84e5b2c22d196e09ce848fa