This reverts commit da0deb2481. I messed up with two different commits. This was not the commit approved by Timothy and needs more testing. PR: 273678
da0deb2481