Revert to d5db043e20aed493d35a092d934ad2146de289fa