Revert some of that and fix it another way