Bug 1016423 - Address review comments