Use current fsf address (#664935)