Workaround somewhere else

The workaround is much more easily done on the JavaScript side.