restore old -s functionality