Revert "move to v2_0 (bug 937701)"

This reverts commit 217b3e90e2e96765f7e78443f99a253ee3f5ae28.