This change essentially removes a stackoverflowerror.