Revert 020ddf0..a7ba235

This rolls back to commit 020ddf05d39b99089bf1e01145f2d9c77b9a4aae.
Revert a7ba235..1017c09

This rolls back to commit a7ba235edb6791640c22d087c474e9b5c7d6db6a.
Revert 1017c09..bb45767

This rolls back to commit 1017c09f46617df39b2621a2a3a30fbb4fd2e727.