Revert 637c5a2..a354c51

This rolls back to commit 637c5a27c97a73da8642366633d9ee6e53c25f88.
Moved to Data Volume Container