Bustage Fix for bug 1079189. a=bustage