Revert bde7c8b..d213290

This rolls back to commit bde7c8b459bfd7650fc47a05b90f51159419a2b1.
Revert 5d4ede2..e232550

This rolls back to commit 5d4ede21b430ce22baba6a2337305cace981e96f.
Revert eade102..3b512a6

This rolls back to commit eade10213f4bc157a872f61afa76f5afbec5cc8c.