Remove support for 1.8.7, try out 2.0.0