Commit cce08b6e6dc01592af017f002d31a67537c2f6a1

ckolivas 2012-02-08T18:13:32

Reinstate original code as much as possible for comparison.