Missing from previous changeset for obanyc-2114