Revert e0fd0cb..ec060ae

This rolls back to commit e0fd0cb893ac2b4fba2e1aaabbb2fa49db0faa19.
Revert e0fd0cb..c28d7b7

This rolls back to commit e0fd0cb893ac2b4fba2e1aaabbb2fa49db0faa19.