Revert e8dab02..b0d2fb0

This rolls back to commit e8dab0221d8b3847bba48f952c13d0b85b9283df.
Revert d64c897..f519d88

This rolls back to commit d64c89715883b69a23a4efd6208db176a817273d.