Revert "s2"

This reverts commit 9dd0031e6b1caf28ae0fb8ce9958a2d7904f9fee.