I can confirm reverting both those commits, allows me to launch BioShock Infinite on both radeonsi and i965 on master