As discussed in the Bugzilla thread, please pull this out and fix it in another bug.