Note that the [same fix](c3e186ec8dcb2ec26d5d56f3e89123b1350c4a6f) has already been merged into `3-2-stable`.