rm sickle (merged upstream)