Bug 906901: Address review nit