Revert "More updates for fixes"

This reverts commit 87823d999804546e0ac93c801f52fb7fec373da5.