Revert "Fixes #18"

This reverts commit bd35ed123d673725296b134dd6e2db9ce0f43571.