Update to make sure we didn't lose any fixes, port of 86aef3da3f33b0fc3061cc4e0fa40281e7284742