Reverted back no-quotes backup solution