Reverted back to safe option