Fixes USERGRID-233 which turns out to be a merge problem.