Ok, so it appears this change was for F32+ only, so I can't merge master into f32 or earlier...

This whole change is still broken AF.

Thanks,

Richard