Revert "SL fixes"

This reverts commit 5e9ab2dae0afa12db1ed9452f04f1904b407662b.