Bug 809949 - Fix build bustage. a=bustage