Revert some unneeded parts of the change in r107886 for the