Fixing commit b3e7e1714f36fa7788224722236fc38fccd836a5

The UT got borked.