Undo fix that conflicts with MR that closed #19

12 jobs for issue_20 in 7 minutes and 52 seconds (queued for 4 seconds)