Partially revert e1f97e2 to pass new test cases
Simplify compatibility logic
plt-racket 6.1
plt-racket: update 6.1 bottle.