Bug 813963 followup to clean up the plugin handling code r=Ratty