Revert e2e43bd..2cc574d

This rolls back to commit e2e43bd0e550a20589161e94f30b297078d35539.
heroic stuff