Merge "Keep method signatures so that generics work"