Do we still need this?  It doesn't look like it was necessary for the use case where we ran into this in Shopify.