We should fix all of that logic. It's incredibly messy (like much of ezbake). I've got a PR for moving our packaging over to vanagon, and it should be a lot more straightforward to fix it once we do that.