Revert hypot changes from #83