Revert fix from #7 as it was breaking tests