Backout 5820d44601c1 (bug 520992) for build bustage