Bug 1046020 - Follow-up: Revert added initializers. r=trivial