As pointed out above, 6.0.1 fixes this, so upgrading shouldn't be an issue.