Remove buggy hierarchy consideration on pick.