AFP: revert changes
Merge pull request #310 from wongcc966422/issue309

AFP: revert changes