remove unnecessarily tricky code
Merge pull request #616 from davidchambers/straightforward

remove unnecessarily tricky code