Revert e9c0304..680b111

This rolls back to commit e9c0304fc799af620eb0e941a3519daddafce5ff.
working loop? what is wrong?