Revert to d3cbcd666