Revert "Update to use Common library changes"

This reverts commit 9ec0741b3a694b6890030aff3fd90c1e01c81f03.
Further updates

Don't know why previous was a revert...