Revert to 70675d0a0533