Rebuild to possible be applied as submodule