The fix by sebres is at [98170da1657fb2dc]