Remove generator so it works in 5.3+