This should be in a separate PR (I think it is already...)