no-svg version of patch #2
no-svg demos