Remove 1.8.7 backward compatibility patches

We are OK with ending the support with 1.8.7.