Backed out my ChangeLog entry and patch in favor of Radek's.