Revert "Turn uselessly static variables into local ones"

This reverts commit b5c206b28d531f346b6270a36d04c65bc293cdbf, which introduced
an acceptance test failure.