Comment 3 for bug 1191375

Option 2) looks like it'd be less error-prone to implement as well.