Removed the TBD's for Chris.

svn path=/sandbox/; revision=83610