Revert "SBREST Solution commit"

This reverts commit bda499816d4220a294217e4e0240574ebc411d03.