Merge pull request #560 from larskanis/rollback #618

Job	Run time
Build	4s
Test (windows, head, 16.0-1-windows-x64, 16)	2m 35s
Test (windows, 2.5, 9.4.26-1-windows-x64, 9.4)	5m 55s
Test (windows, mswin, 16.0-1-windows-x64, 16)	2m 1s
Test (ubuntu, head, 16)	1m 10s
Test (ubuntu, 3.2, 12)	1m 17s
Test (ubuntu, 20.04, 2.5, 9.3)	1m 28s
Test (ubuntu, truffleruby, 13)	1m 44s
Test (ubuntu, truffleruby-head, 16)	1m 41s
Test (macos, head, 16.0-1-osx, 16)	1m 31s
	19m 26s

Provide feedback