Revert AF update.

This reverts commit c0fae35d9eb7d212b64a47e8477f9829f7615a05.