Revert 040247b..12c1706

This rolls back to commit 040247b065cde41a92406fb04850cda9cd93837f.
Revert 12c1706..631dc55

This rolls back to commit 12c17061874a1c28276a54264f2899d43f0662cc.