Backed out changesets b23fc7520b99 and 45be8334f34f (bug 866823) for assertions. a=backout