revert some more spin optimizations that turned out to be pessimizations