Remove some unneeded complexity.
Merge bug25590