Fixes #1618.  Don't double prepend AF_