Revert "Get rid of the -S switch."

This reverts commit a25c4cc01c61ef83d9e636fb028b14e14a9d0dd7.