Revert "Shelf label rework"

This reverts commit c89c69b439b43d252c9f751bbee6863fd7f37a9f.