Removing the support for 1.8.7