Move back to root6 used so far.

Current head fails to build with our patch applied. Reverting back to the old HEAD.