svn path=/trunk/; revision=43538
This has already been run so it may not be necessary any more, but may as well check it in in case it can serve as a base for other, future, global hf changes. svn path=/trunk/; revision=34242