Bug 875512 - Part 2b: More bustage fix to original patch; r=ted