Elgg/Elgg — pull request #6782 by brettp (2014-04-25 02:46:42+00:00)
Title: Revert 6497

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