r2209 - revert odd override from changeset:2170