Pull Request for Issue757

This issue was simply a case of code being commented out for unknown reasons.  @davidChevrier, could you go over this before I merge it into master?  git blame said it was all your fault :P 

(you can ignore the commit by @epengr because it's not related to this issue, but it came along for the ride anyway)