Comment From: wilkinsona

We need to roll back to 2.3.17 as there's a regression in 2.3.18.