Merge "Removes the defunct -s flag."