Revert 324cd05..7c8b6d4

This rolls back to commit 324cd057aa306dfa43971121b8a84d132aff7392.
Revert 7c8b6d4..2ffa147

This rolls back to commit 7c8b6d4636c70b6f64aa4225e3272823ab173822.