Revert 3bb2e49..169536a

This rolls back to commit 3bb2e49b492afaebdd58e3c23bff8d32c07159e8.
full delete AFN (again :-)