There is a circular require going on and the warning breaks the build. Reverting
for now to get the fix the build.

This reverts commit dae24cc0.