back out 3a8893b28489 (bug 712939) and 39adab158c17,16add78c43e3,37193db7e15b  (bug 712873), for build bustage.