-Revert commit 6c4ca38d56a46746dcba6fcd7e54c74a8723926b -Reapply partially commit b757e9d090eca67fd2cbae4929b0742715bc9fa3