#1923: Reverse merged r8531 (changes in application managers) as this introduced errors in the type discovery.