Remove hard-coded limit again.