Revert 1918268..8ba7b82

This rolls back to commit 19182685853c0395b76ee71b3a5ca2983cea4192.
Revert 8ba7b82..c25ff65

This rolls back to commit 8ba7b8260bbd7a331eb2d7cbb1b6d870cd7cdf8b.
Revert 1918268..bd196b7

This rolls back to commit 19182685853c0395b76ee71b3a5ca2983cea4192.
Revert "Revert 1918268..8ba7b82"

This reverts commit c25ff6594d4837a9c239ab3a2b2b1882d9a9a688.