Comment From: snicoll

Thanks for the PR but that's not the right way of fixing the issue. I'll reopen the related issue and we'll give it another go.