Reinstate memory limits now we're not using rhino