I think that commit [3752da03] handles this correctly.