Backport Fake IF Picker to reduce diff sizes