Revert commit bd1593889ac4389d121de82091eaca42b31b9d1e