reverts #989