revert 2007-01-11 Nathan Sidwell <nathan@codesourcery.com>