Revert r20089, thanks SVN for not a nice conflict resolution!