Breaking API change here! I'd rather not do that.