Another fix for incomplete CONTAINER_LOCK_HELPER_START change