BZ1073001 - Advanced enumeration stopped working
(cherry picked from commit d2ea75733fff95eb168f7b43de0dc352ba9811ad)