diff --git a/include/boost/graph/random.hpp b/include/boost/graph/random.hpp
index f99265dc2..94bc32974 100644
--- a/include/boost/graph/random.hpp
+++ b/include/boost/graph/random.hpp
@@ -38,15 +38,11 @@ typename graph_traits< Graph >::vertex_descriptor random_vertex(
 {
     if (num_vertices(g) > 1)
     {
-#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581))
-        std::size_t n = std::random(num_vertices(g));
-#else
         using vertices_size_type = typename graph_traits< Graph >::vertices_size_type;
         uniform_int< vertices_size_type > distrib(0, num_vertices(g) - 1);
         variate_generator< RandomNumGen&, uniform_int< vertices_size_type > > rand_gen(
             gen, distrib);
         std::size_t n = rand_gen();
-#endif
         typename graph_traits< Graph >::vertex_iterator i = vertices(g).first;
         return *(boost::next(i, n));
     }
@@ -60,16 +56,11 @@ typename graph_traits< Graph >::edge_descriptor random_edge(
 {
     if (num_edges(g) > 1)
     {
-#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581))
-        typename graph_traits< Graph >::edges_size_type n
-            = std::random(num_edges(g));
-#else
         using edges_size_type = typename graph_traits< Graph >::edges_size_type;
         uniform_int< edges_size_type > distrib(0, num_edges(g) - 1);
         variate_generator< RandomNumGen&, uniform_int< edges_size_type > > rand_gen(
             gen, distrib);
         edges_size_type n = rand_gen();
-#endif
         typename graph_traits< Graph >::edge_iterator i = edges(g).first;
         return *(boost::next(i, n));
     }