Remove 1.8.7 here