Folded in #32