Revert "Make everything return speed (free for all modes)"

This reverts commit d7b1a0bf3596523b3ba5338d8267b4edd8a5c901.