Fixes #321. Will update description (and probably break the TOO_FAST stuff out into another MR) later.