Revert fix for #227