Revert 4ccbe93..938116c

This rolls back to commit 4ccbe931a9ee7edd1567c651062584b453a2f36e.
Revert 1f6ebf2..787f40a

This rolls back to commit 1f6ebf2e30517a144b9693c2795fdd3480d33636.