Revert "omg straights"

This reverts commit 719b211fdad29d1d9a46a60191362280eac67e19.