Revert "aff"

This reverts commit 6004f5cad1016c12965715496d6a9b30afc5ed29.