[DEV-2916] Fix build error and remove NoSSR wrappers (#1717)

[DEV-2916] Fix build error and remove NoSSR wrappers (#1717) #256