Revert to limit but use variable schema