Include Yan's patch that uses data generated with NSS-tools and passes the test