Revert "Potential solution for #53"

This reverts commit 255bb9722eecb67e44bdd14136945af45daed113.