Thanks for reporting @davidkingham. I’ve confirmed that this was indeed a bug and fixed it in
https://github.com/discourse/discourse/commit/27c793a192ea0443373dc65517b50dfa21480441
This part of the code was also untested territory so I’ve added tests as well.