Whoops, add Eric's changes back in