This reverts commit da1997d0b786181f3e3375e3eef09899486a3833. I was probably over-eager on this: it's a breaking change. There are probably some non-breaking changes we can make first, and when we're ready to make breaking changes again, we can revert the revert.