This is to reduce merge conflicts (Modules/Setup.stdlib.in) for subsequent pull requests for the issue.