Part-1 fix for #2418
This change brings a change which was done for the 'mc' package to allow for clean repo and have a cleaner github drop in experience.