GBE-349: revert code of GBE-347