LPS-35431 Roll back some SF from LPS-34846, web content now scoped corre...

...ctly