Merge "better workaround for bug: 6020860"