Commit b45a7212715b2e1ee6bcfe71fc89e537c23c41a6

ckolivas 2014-06-16T08:32:52

Revert "Minor style police" This reverts commit 6344573cdb7e7c8e1ae880f0ed3c8bba15075cdb.