Revert 6497

WIP. Still needs:
- [ ] Feedback for code
- [ ] Feedback for rst docs
- [ ] Tests
- [ ] ???
- [ ] Sleep