Revert 26a33af..4daf66b

This rolls back to commit 26a33afcc8bc295d10b0154e9b10b87813df3a79.
Revert 1c30028..dd41888

This rolls back to commit 1c30028a1833b4d5978fbe8bee0a6f4849636da3.