This reverts commit 29caa185a7. Not clear what the proper thing to do is. cf94cdb59b renders this question mostly moot. Reverting before 17.03 branch to avoid a repeat of #19054.
29caa185a7
cf94cdb59b