OK, let's fix that first at #2761 and then get rid of the hack here. Could you review that PR?