Revert "Part 2 of the backport"

This reverts commit baa86605f6211b7d3e062d0193b740d7720132d7.
Revert "Making a start to backport MarketPlace and ShowCase into the viewer"

This reverts commit 2ccaea150968ff527047848eb4f23b3fe617b1a0.