This reverts commit fbbc4a4979, reversing changes made to f254e38385. Fixes #7851
fbbc4a4979
f254e38385