Revert "shop fix"

This reverts commit 2069c663a9f6a37caa2dead5c1440d0f8bd22e1d.