rBf35f7bd97a4151 was the proper fix it seems.
Do not do much for now, but would have been enough to catch the crash introduced the other day in linking code...