Backed out changeset 24e725b72a0d and 1230bd543454 (bug 792806); a=lsblakk