Don't repeat yourself.
Merge bug25044