Updated to remove changes that were applied to the trunk and to use the