Moved gilbert-related code to match the distutil changes.