Reevert "Haida upport for B2G"

This reverts commit edbdad824285e62b3ffcfadc8db30976e786df0b.

Conflicts:
	haida.xml