Add hotfix from dotcloud/docker#4574