reverted changes to changes in trunk