This is now the third PR today to contain this particular bug fix, which is fascinating considering it has been around for many weeks. :)