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