manually apply batman PR677, https://github.com/Shopify/batman/pull/677/files