Commit 590497658053941b756c7648a3cd97b0e0e98a56

ckolivas 2012-02-08T18:13:32

Reinstate original code as much as possible for comparison.