Revert changes and fix container crash

Sometimes the correct solution is much easier than first anticipated.