Reverts previous commits

Reverts commits 72609e94d3f136f588b7b15d8f4263a3c88611e2 and  27fba17ddf914aa082b95f646d799368ba088e06