Revert "Speed Stuff"

This reverts commit d45f28d52c4d3272461c4e09665695d744b83256.