Sstuff
Revert "Sstuff"

This reverts commit d9191db5ebcb5e7a6d9c154fbfc39d92add94ed6.
Merge remote-tracking branch 'origin/master'