Drop 1.8.7 completely