Bring back bundle_js; partially reverts 813aa5ca3.