Vendor batman. See PR #744 for changes made.