Simplify due to changed format.
Merge bug 25786