Really removing 1.8.7 compatibility