Revert b9756c7..95edfbe

This rolls back to commit b9756c7028938aa24786d1c9da9e6c4dad3ff61d.
Revert 4c4d6b8..20976df

This rolls back to commit 4c4d6b8a73bce3d143ce8c59d693ddda711d4dd2.
Revert c1a595c..da7b3a8

This rolls back to commit c1a595cf1cba26552bfa69585d851d1178e6a30e.