Bug 877342 - Remove esr1 specific code. r=bhearsum