Bug 942693 - Rebind this when updating header