Reverted r21065 as too much was committed.

The command used was:
svn merge -r21065:21064 .