Is this change related to this bug?