Partial revert of 9f1108e52e4787610a488868d774992e1ca28979.

This change should not be necessary.
Merge pull request #164 from bantu/master

Partial revert of 9f1108e52e4787610a488868d774992e1ca28979.