COMP: Revert Andri change that caused test failure.