This didn't seem to be working out of the box, before e374f3eb9c8a182de5eac339c1e172b1dad2dfe4 and e966a4d15ea492933f79d783954cf33d7bd95abd