Er, this addition appears in #633 too...why is this here? Holding off of the merge.