Revert fix for #26 as it is a breaking change