Bug 841554 - Follow-up: fix some weird Aurora merge oddity. a=bustage