Remove 1.8.7 compatibility

We were only keeping it here for masochistic purposes