Revert "0.96.7.1"

This reverts commit 9eba097b814c25b338cef6ee0d7dd01877aa00bc.
Revert "Revert "0.96.7.1""

This reverts commit ba2256275511f6acbcf2fcd4bf666fce34c7fdb9.
Revert "0.96.7.1"

This reverts commit 9eba097b814c25b338cef6ee0d7dd01877aa00bc.
0.98