More submodule fun! Switching back to amd branch.