Revert c78c293..0a87db2

This rolls back to commit c78c2930019b222e3a09e770644d82cbf228022b.
Revert 08e24ea..6242469

This rolls back to commit 08e24ea84f3b6ac980bee7157725562eda3708ad.