actually ditch 1.8.7