I reverted 7379049d which solves the acute problem, but leave this bug for Andy to close once he has had time to re-introduce 7379049d the way he intended it.