This has the side effect of making this method rugged call free, which
is the reason I actually changed this.