pre-guadec: hurried commit