Revert "merge 0.9.9.12"

This reverts commit a9d0d74a8f2a85399e0ebb2daa91cad826cb6027, reversing
changes made to 08c16ee26423762eb1a3240d7391599d2f734085.