Bug 852847 - Part 5: Fix assertions caused by part 4. r=me