OH-198: Postpone the changes to fix test error.