Port bug 891474 to fix build bustage. r=bustage fix port of m-c fix,a=bustage fix.