Uncomment once Bennett is merged