Fix G's changes to still support no-root build.