Merge "Fix a wonkily named function."