Make this non-destructive for 10.9 users