Revert "Fix for #125"

This reverts commit 91a2f77c606cef9e845403a6d6be9be93c756e4b.