Adding a locator back which got removed during merge