Cleanup some leftovers from '-s' removal in r302792.
MFC after: 2 weeks Sponsored by: Dell EMC Isilon