Revert "Properly Fix #301"

This reverts commit 6ef35083620a77517dedcfc86c987436705988be.