Someone forgot to refactor completely?
Merge pull request #857 from kaysoky/BridgeBroken

Fix build