drop these as discussed on IRC, and I think we're good to go