Revert "Revert "Revert "Remove Inventory Tweaks"""

This reverts commit 4526da4fe9c7fec49827c72730378669b3958eca.