Revert key format support (will be a separate package).