I fixed the underlying error somewhere in the merge in shopify master.  Looks good to remove now.