Last trunk commit introduced a ATOMIC_PACKAGE_REPOSITORY bug, fix it