Remove 'yield from' due to incompability with 3.2