Temporarily revert changes made in 5156af until it's had a proper code review. See #131.