Revert eb4bc25..b2ded5a

This rolls back to commit eb4bc2551155a88d71623914b7711c2d141d1b1b.
Revert b2ded5a..9166992

This rolls back to commit b2ded5a8db286ebf9fa5e443b7dc036a387f4bb3.