Revert 788e23f..f0a35fb

This rolls back to commit 788e23f630b0461bcfce7a29ebac7dbda3759a51.
Added ConnectionContainer