Revert 69adcbd..c458a3e

This rolls back to commit 69adcbd4277b447b243493d9a0554005e140b19f.
Revert bc72609..766512d

This rolls back to commit bc726099a3b1760d5ebf3fded731670799aa91f7.