Merge "Fix build breakage due to extraneous dereference"