Revert "Merge pull request #26915 from mwargers/marketplace5"

This reverts commit 654bf90145126043eae0a27f96186eb4f0c928b2, reversing
changes made to 4c230b117c55d987ae0ff71df9d4d8f080b93d3f.