Bring up to parity with JS-only repo