DB/NPCs: Revert some recent faction changes

These factions do not exist in 3.x dbcs and might have changed in >4.x