Follow up from #52. This was done in a compatible way for now, but eventually should get dropped to reduce both bundle size and potential confusion.
