Could you do this in a separate PR? I'd like to merge that.