This reverts commit 1186833b2d, reversing changes made to bb180b0f59. #3687 #3701
1186833b2d
bb180b0f59