This isn't needed as part of this PR, I think. Hence I've removed it during merge.