Revert 1.7.2 changes to fix shelf