VRAS-1095: Revert previous commit. Going with a different approach
VRAS-1095: Revert previous commit. Going with a different approach

This reverts commit 1d969ecee4f5f79446064fdd41fc6db21007e239.

bridgeit/bridgeit-common