Revert d8a8698..dc9b281

This rolls back to commit d8a8698d18f94c7c13c7a79bbe140b00f64ed5c1.
Revert 5ebd529..2d9ec34

This rolls back to commit 5ebd529b538b2147dbefd8a93b22622c06f1cfea.
Revert b8617c8..8e71797

This rolls back to commit b8617c846927666d41de2ab457713e7c4525db3d.