Import rewritten Bolt for new protocol