bug 888952 - implementing peterbe recommendations