diff --git a/Libraries/LibTLS/TLSv12.cpp b/Libraries/LibTLS/TLSv12.cpp
index 1f1cad15361..42ef854f0f9 100644
--- a/Libraries/LibTLS/TLSv12.cpp
+++ b/Libraries/LibTLS/TLSv12.cpp
@@ -202,7 +202,7 @@ TLSv12::~TLSv12()
 
 ErrorOr<NonnullOwnPtr<TLSv12>> TLSv12::connect_internal(NonnullOwnPtr<Core::TCPSocket> socket, ByteString const& host, Options options)
 {
-    TRY(socket->set_blocking(options.blocking));
+    TRY(socket->set_blocking(false));
 
     auto* ssl_ctx = OPENSSL_TRY_PTR(SSL_CTX_new(TLS_client_method()));
     ArmedScopeGuard free_ssl_ctx = [&] { SSL_CTX_free(ssl_ctx); };
diff --git a/Libraries/LibTLS/TLSv12.h b/Libraries/LibTLS/TLSv12.h
index c49903f9968..4ca5cd642d3 100644
--- a/Libraries/LibTLS/TLSv12.h
+++ b/Libraries/LibTLS/TLSv12.h
@@ -14,26 +14,7 @@
 namespace TLS {
 
 struct Options {
-
-#define OPTION_WITH_DEFAULTS(typ, name, ...) \
-    static typ default_##name()              \
-    {                                        \
-        return typ { __VA_ARGS__ };          \
-    }                                        \
-    typ name = default_##name();             \
-    Options& set_##name(typ new_value) &     \
-    {                                        \
-        name = move(new_value);              \
-        return *this;                        \
-    }                                        \
-    Options&& set_##name(typ new_value) &&   \
-    {                                        \
-        name = move(new_value);              \
-        return move(*this);                  \
-    }
-
-    OPTION_WITH_DEFAULTS(Optional<ByteString>, root_certificates_path, )
-    OPTION_WITH_DEFAULTS(bool, blocking, true)
+    Optional<ByteString> root_certificates_path;
 };
 
 class TLSv12 final : public Core::Socket {
diff --git a/Libraries/LibWebSocket/Impl/WebSocketImplSerenity.cpp b/Libraries/LibWebSocket/Impl/WebSocketImplSerenity.cpp
index 867bad492f3..b6baee437c9 100644
--- a/Libraries/LibWebSocket/Impl/WebSocketImplSerenity.cpp
+++ b/Libraries/LibWebSocket/Impl/WebSocketImplSerenity.cpp
@@ -46,8 +46,7 @@ void WebSocketImplSerenity::connect(ConnectionInfo const& connection_info)
         auto host = connection_info.url().serialized_host().to_byte_string();
         if (connection_info.is_secure()) {
             TLS::Options options;
-            options.set_root_certificates_path(connection_info.root_certificates_path());
-            options.set_blocking(false);
+            options.root_certificates_path = connection_info.root_certificates_path();
 
             return TRY(Core::BufferedSocket<TLS::TLSv12>::create(
                 TRY(TLS::TLSv12::connect(host, connection_info.url().port_or_default(), move(options)))));
diff --git a/Services/RequestServer/ConnectionFromClient.cpp b/Services/RequestServer/ConnectionFromClient.cpp
index e6d5ec91e2b..65e9158db49 100644
--- a/Services/RequestServer/ConnectionFromClient.cpp
+++ b/Services/RequestServer/ConnectionFromClient.cpp
@@ -61,10 +61,9 @@ static NonnullRefPtr<Resolver> default_resolver()
 
         if (g_dns_info.use_dns_over_tls) {
             TLS::Options options;
-            options.set_blocking(false);
 
             if (!g_default_certificate_path.is_empty())
-                options.set_root_certificates_path(g_default_certificate_path);
+                options.root_certificates_path = g_default_certificate_path;
 
             return DNS::Resolver::SocketResult {
                 MaybeOwned<Core::Socket>(TRY(TLS::TLSv12::connect(*g_dns_info.server_address, *g_dns_info.server_hostname, move(options)))),
diff --git a/Tests/LibDNS/TestDNSResolver.cpp b/Tests/LibDNS/TestDNSResolver.cpp
index 7551a831595..69fa18ed7a6 100644
--- a/Tests/LibDNS/TestDNSResolver.cpp
+++ b/Tests/LibDNS/TestDNSResolver.cpp
@@ -94,8 +94,7 @@ TEST_CASE(test_tls)
             Core::SocketAddress addr = { IPv4Address::from_string("1.1.1.1"sv).value(), static_cast<u16>(853) };
 
             TLS::Options options;
-            options.set_root_certificates_path(locate_ca_certs_file());
-            options.set_blocking(false);
+            options.root_certificates_path = locate_ca_certs_file();
 
             return DNS::Resolver::SocketResult {
                 MaybeOwned<Core::Socket>(TRY(TLS::TLSv12::connect(addr, "1.1.1.1", move(options)))),
diff --git a/Tests/LibTLS/TestTLSHandshake.cpp b/Tests/LibTLS/TestTLSHandshake.cpp
index 010e108b645..ccb2c3ebe54 100644
--- a/Tests/LibTLS/TestTLSHandshake.cpp
+++ b/Tests/LibTLS/TestTLSHandshake.cpp
@@ -42,8 +42,7 @@ TEST_CASE(test_TLS_hello_handshake)
     Core::EventLoop loop;
 
     TLS::Options options;
-    options.blocking = false;
-    options.set_root_certificates_path(locate_ca_certs_file());
+    options.root_certificates_path = locate_ca_certs_file();
 
     auto tls = TRY_OR_FAIL(Core::BufferedSocket<TLS::TLSv12>::create(TRY_OR_FAIL(TLS::TLSv12::connect(DEFAULT_SERVER, port, move(options)))));
 
diff --git a/Utilities/dns.cpp b/Utilities/dns.cpp
index f3ea80bec02..db274613479 100644
--- a/Utilities/dns.cpp
+++ b/Utilities/dns.cpp
@@ -78,8 +78,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
             auto make_resolver = [&](Core::SocketAddress const& address) -> ErrorOr<DNS::Resolver::SocketResult> {
                 if (use_tls) {
                     TLS::Options options;
-                    options.set_root_certificates_path(cert_path);
-                    options.set_blocking(false);
+                    options.root_certificates_path = cert_path;
 
                     auto tls = TRY(TLS::TLSv12::connect(address, server_address, move(options)));
                     return DNS::Resolver::SocketResult { move(tls), DNS::Resolver::ConnectionMode::TCP };