Re: [OS-BUILD PATCH] Revert "Merge branch 'make_configs_fix' into 'os-build'"