Addendum to 2010-02-07 commit.