This reverts commit fbeb95d6.
Issue #3109696 by Loparev, AjitS: TMGMT Extension Suite setting doesn't work for new installation after 8.7.0
This reverts commit 141fee6e.