This reverts commit 599b7690fa917ea4e9cd67275e34d0b5a0f51aa9. Since adding a cross project dependency is a concern.