Fix for 3544a84 which breaks the unit tests.