Revert to d6558be915