Really remove 1.8.7