Revert 7392899..f823abf

This rolls back to commit 7392899ab55a8aa238de147a228671f05f6bf717.
Revert "Merge branch 'bridge'"

This reverts commit 7392899ab55a8aa238de147a228671f05f6bf717, reversing
changes made to bb1f0211dea7a294dc59a7b6a2e78436bea8e062.