Revert 3bf5402..7f8a279

This rolls back to commit 3bf5402147d9c15bafdd52747f71feb6d7296f5a.
Revert 7f8a279..ea91a84

This rolls back to commit 7f8a27972b711e118f7fbb65aec2df5778840f54.