comment-reply.min.js loading on pages with comments turned off

I have comments turn off for Pages but comment-reply.min.js still loads.

<script type='text/javascript' src='https://www.mysite.com/wp-includes/js/comment-reply.min.js?ver=4.6.1'></script>

I see in init-front.php where it loads:

if ( is_singular() && get_option( 'thread_comments' ) ) {
      wp_enqueue_script( 'comment-reply' );
    }

This should be changed to:

if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
      wp_enqueue_script( 'comment-reply' );
    }