Revert commit 404850a024fe6123386f9fdbee311311ba83b1ae