Revert 4f5c9fe..6e42d20

This rolls back to commit 4f5c9fe1978b283dffb305042ef7704ccc16c050.
Revert ecd470e..5a1d00c

This rolls back to commit ecd470e5a5a05aa72c58c5eb462231981116e11b.