We removed the comment-out code, which relates to #831.