Switch to own galaxys2-common