Backport #8 fix in 2.3.4 as well as it's easy, safe to do.