Workaround for a thin dynamic problem resulting from recent self
test fixes.