This reverts commit d5193e34. Reverted at @EricWF's request so it can be relanded with a better commit message.