Drop 1.8.7 support rather than hacking spec results.