Revert revert 915920

Fixes gjslint quoting issues