Reverts  #4885