Revert improvements while I import the new changes

This reverts commit 077399b724cb4d53bc7eeb54fa995750a4ba6819.