Reverted pull request from @sarahemm, reopens #7