Bug 881957 - Address Arthur's comment