Added this cleanup to #3471