Revert 49b28fc..9e888e3

This rolls back to commit 49b28fcf205778db61fedfee2aa3ee03e031a7d1.
Revert 174334f..d00875f

This rolls back to commit 174334f8739442c0a3952360e600de422b2d2c5c.