KRACOEUS-6996: revert schema change. this commit is critical for 8929c03ae6