Commit 11339 for the trunk.