This should be resolved by the changes in [6a11f1215890a7c3].