removed changes applied upstream