Revert 0e5b481..6ca79bb

This rolls back to commit 0e5b481f706a6b82088f963255f0c646d4200633.
Revert 87dce4e..a27c8ea

This rolls back to commit 87dce4e088bd39dc669355b1e9e183f6e2bfa775.
Revert 0e5b481..1900555

This rolls back to commit 0e5b481f706a6b82088f963255f0c646d4200633.