timob-16840: revert fix for timob-16358