Revert "Apply Temporary fix for #7"

This reverts commit d91bb972d37aa62a5b40fb27a5e976f9b09cd4dd.