Import chamges from coreutils, so that the code now assumes