The original issue, #5611, was concerned with safe calls. However, the
test inexplicably used an unsafe call. Fix this.