Fixed (directly) in trunk: [ae13ed6583], following what was done by dgp in [76e2d9c095].