Fixes: #2688 non-JS fall-backs should be removed