Revert the fix for #574