Revert 50f8db9..33f2e10

This rolls back to commit 50f8db90b5dce4781b331c0b5bddce76ff4a1d7e.
Revert 080ed1b..71f13c5

This rolls back to commit 080ed1b8849a5e30da58748e6aafd5076878a86f.