Revert change to 'containers' paths

    Fixes #2938.