Fixed contact locator based on the changes from bug 835742