So it seems that this was basically always broken. Anyway, I have proposed a fix to that issue and another one I spotted by just reviewing all callers of that SPI.