Revert d5c25ad..fde7225

This rolls back to commit d5c25ad692fcadea9527fbf11eae00811ac7eb8a.
restart