Revert "bus error bug fix, bug fix"

This reverts commit 7824b01acc1f88a5e8d8a59d7c9933031a2b593d.
Revert "Bus error bug fix"

This reverts commit 6c2a62e37d23454d122083fd700a337eb765fac8.
Revert "Bus error bug fix"

This reverts commit a6cb3cb238d74aa3275501377ab2c2908df71766.