Now I am confused. Workaround in functional test is back again...