Do not revert d8a57f7, and add some tests showing the broken cases.