Closes #16538 Basically reverts #16497 and some minor changes. Also adds a link in the docs. This reverts commit ec281df70b.
ec281df70b