Drop 1.8.7 support and fix 1.9 support.