I didn't like this either but I thought that was what you meant by your
comment on the original PR. I will change this.