Make containers unloadable again

Closes #1062.