This reverts commit 1d0caa7b035875cee70bf8072b46b19e4965c65b. Thanks to @vcunat we have a 'benchmark' machine again!