This reverts commit af152556. The network target is probably not really required, needs further testing.