Revert "Fix for issue #116."

breaks more than it fixes

This reverts commit c55fd53bb3aae7d57725a0a61ab5a5bfd5227ec5.
build