Fixes: #2687 non-JS fallbacks should be removed