Revert commit 9563470c29241ac85a1490892b29fb3d5458a11c
Revert commit a70cb66434464c2e7a6a55334bf174773c7fa5f3 and cf4b35dcc7026e7c4bad9b59641fe1bd401f1c08