Revert "Merge remote-tracking branch 'origin/lp' into lp"

This reverts commit d0cb67ab7ad76284e2d48d626f71eaf91a7d1420, reversing
changes made to 6ac586150752967a01d3a0daf1950386ab3d1284.