re-remove (not sure why this didn't get picked up in the merge)
re-remove (not sure why this didn't get picked up in the merge)

git-svn-id: 4775deae53630d70f6da4907e7e238fd9f48a65c@5942 e27351fd-9f3e-4f54-a53b-843176b1656c

red-hood/calendarserver,red-hood/calendarserver,red-hood/calendarserver,red-hood/calendarserver,red-hood/calendarserver,red-hood/calendarserver