Removed obsolete workaround for KT-1752.