Roll back to 4.0.1_r1.1 and prepare for different repo structure.