Fix a bad merge from Bug 832883.