Merge "Work around compiler optimization"