This reverts commit c92a8c0a0f68fbbb23e3fdde071007e63a552e82. It breaks builds and has unaddressed review comments.