Bug 836654 - Part 12 (follow-up): Unbust debug builds, and remove an XXX comment.

--HG--
extra : rebase_source : b3244fd66e13c7519ad6e5f795eb78c72ccfdd9c