Backout commits not yet intended for master.

This backouts the following commits:

be8e507f51d1cabfa088353668a10573da8d2de4
61070f1236cb71f8d8d29da14a11613ff8e826ba
608200f2d78a72870f71bbee96e884098305771b
dc7dabb9143ecf97504843ae5c3a8c603335e7ce
b419d0c0cd3f5796f25e622393d54ba8dbd34c5b
2a44c83c14cf5a4b908a208438638f944bd74028
cde26f639203776cf8287ef9aba0495d60c2fb8b
e920be95c75735ca8a6af29733caf35e04743973