Revert "Moved to shared"

This reverts commit c3d7fda425cc280efcb2c8b54de0ed8ae9a98a1f.