Revert to 2.9.5 release: b7cd961d72deec199542e9ee256154671873f54a