Merge "Revert "Continue to remove code around legacy captions"" into main