Looks like out of update. The line have been removed. You should rebase your patch to fix the conflict.