Revert the key prefixing from 2475da5