Revert 0fd58ae..71f7543

This rolls back to commit 0fd58aef8db6a94541ffafe449b6a9e9f658bee0.
Raspando TODO