Take into account some remarks by tianon (https://github.com/dotcloud/docker/pull/4497)