COR-289: revert changes as it causes regressions in KS