Shouldn't this be in a separate PR?