This reverts commit aa5e108553ace3079c6087dec796b9e58fe45fa4. This commit was not meant to land yet, it should have gone for review, and doesn't yet include all the parts it should touch.