Revert 2d392e8..25168bf

This rolls back to commit 2d392e89962fc91d5dec441e8854f4c78dfe4e9e.
Revert e7cb2ae..a79c56d

This rolls back to commit e7cb2ae1ab074f10ee2f62d65dd0722939471f10.