This reverts commit 2a191cae2dff9b2616d4e7a4d47ae2ffb2cdf15d.
Fixes #12162 closes #14155
closes #12338 closes #12814