Remove issues with 1.8.7 dependency - breaks tests