Revert "CLDIDE-2164; remove find factory by attribute;"

This reverts commit 7826fce993015b7b662da436263bc9168af3c4a7.