The 9.3.5 release notes contain...
...which I thought was this bug, hence my confusion. If anyone else is experiencing this bug, they may erroneously be led to believe that 9.3.5 contains the fix.
I will attempt to build 9.3 stable head and retry my upgrade.