We dropped 1.8 support, we should get rid of this