Bugfix for functional tests broken with 68daf6d.