Revert changes that break key-value creation