Added issues #1474 and #1475 to replace this commented code