add the unittest2 workaround back