Switch to galaxys2plus-common