Lets wait until after the code freeze is over and people apply their patches, otherwise it'll be hellish. This reverts commit 75632 SVN revision: 75704