Revert "Added workaround for #51"

This reverts commit 80000b9eeeae362b3e05932290015596c90dd880.