[Poll]: Revert afz commit