[PATCH] Bring back -d option without need for argument