Revert "DNN-6234 - removed internal set to allow unit testing"

This reverts commit 27b56787e702aa33623e94d059c483e3e5918857.