oops, dangling identifier due to bad merge of upstream