Revert 4135106..9295fbc

This rolls back to commit 4135106520f7207967eef9c4eb799189616db6d5.
Revert 9295fbc..a6b2d08

This rolls back to commit 9295fbcf23cfa45af8c96780498fbc80797161eb.