Yup, there were changes from both sides during a merge from master and I was being overly careful not to delete things. I'll remove it.