Merge "Follow up change to clean up the code (no-op)."