Breaking change discussed in #247, to go out in 3.0. I'll implement this once #247 reaches `master` and `3.0`.