I don't plan on fixing the former at the moment, so I'll just add back these two accessors so that it's happy. svn: r18144