Pushing this most immediately for a possible fix for our EB woes