No longer needed.
Merge in default
...and thus remove some redundant code.
Merge bug 25786