Revert "s"

This reverts commit 8c47a08f486c7953dd0a1362acc7a85b06e381cc, reversing
changes made to 93de94be26cf810960215751d8717b045ae9561b.