Revert "new fixes"

This reverts commit 3b7f4a468027abf7d108d75e1dd835a9abf85f04.