Revert "final fix 3 updates"

This reverts commit d9fb2b5b1aba7f0e43df701ea2f83efd00157663.