I created https://www.assembla.com/spaces/ddEDvgVAKr3QrUeJe5aVNr/tickets/3156 to deal with this case; you don’t need to do anything at this place specifically apart from maybe a FIXME pointing to that ticket, since when that is done this change should not be necessary anymore.