Revert so that we can merge a different branch that's had more recent work instead This reverts commit ba518637d49380955f4bd2f0e6009888037fa82e, reversing changes made to e56849c6056220b8dd555f841f7e0a5028b25af0.