Edit deleted original as I found the problem.
Whoops, merged a full 4.24 commit into 4.23 instead of just one part of it. Reverting to fix it, by the time you read it should be corrected.