@@ -30,11 +30,11 @@
  *
  * @brief A class for parsing URIs as per RFC 3986 and accessing parts of it.
  */
 @interface OFURI: OFObject <OFCopying, OFMutableCopying, OFSerialization>
 {
-	OFString *_Nullable _percentEncodedScheme;
+	OFString *_Nullable _scheme;
 	OFString *_Nullable _percentEncodedHost;
 	OFNumber *_Nullable _port;
 	OFString *_Nullable _percentEncodedUser;
 	OFString *_Nullable _percentEncodedPassword;
 	OFString *_Nullable _percentEncodedPath;
@@ -46,16 +46,10 @@
 /**
  * @brief The scheme part of the URI.
  */
 @property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *scheme;
 
-/**
- * @brief The scheme part of the URI in percent-encoded form.
- */
-@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
-    OFString *percentEncodedScheme;
-
 /**
  * @brief The host part of the URI.
  */
 @property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *host;
 
@@ -379,13 +373,13 @@
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 extern bool OFURIIsIPv6Host(OFString *host);
-extern void OFURIVerifyIsEscaped(OFString *, OFCharacterSet *);
+extern void OFURIVerifyIsEscaped(OFString *, OFCharacterSet *, bool);
 #ifdef __cplusplus
 }
 #endif
 
 OF_ASSUME_NONNULL_END
 
 #import "OFMutableURI.h"