Here's exactly why I don't want to land this stuff in butter, and would rather fork and do it in a popcorn.webmaker.org repo.