Bug 824986 - Followup: fix botched merge.