Switch to new location for 2.0 builds. r=me