Revert "Fixes #29=04"

This reverts commit 794dfadf538f2a65adc9669a2143e0188219c578.
Fixes #204

Style changes as discussed with  bencorlett