Revert 2bc7b63..30ca880

This rolls back to commit 2bc7b636fdbd91bd86934d5b727ce85e5f2163e8.
Revert 4fbf6df..2d6e73e

This rolls back to commit 4fbf6dfe2c9513daf6b7324574db81612632d19d.