Revert bdd3996..477169c

This rolls back to commit bdd3996d38d885e18e5c5960df1c2c06e34d673f.
Revert 477169c..4f7efac

This rolls back to commit 477169c5bc7bc95e5ebc0abfa4680ca9c87e80eb.