You should remove this line and close #852 (or whoever handles the merge conflict should be sure it stays removed.)