Discard commit that breaks our fix for lip sync issues