Roll engine back to 96061d62281d1840af3ee75fefa41d1cf254fce6 (#51785)
Roll engine back to 96061d62281d1840af3ee75fefa41d1cf254fce6 (#51785)

* Revert #51693
* Revert #51689

https://github.com/flutter/flutter/issues/51776
flutter/flutter,tvolkert/flutter,flutter/flutter,tvolkert/flutter,tvolkert/flutter,Hixie/flutter,Hixie/flutter,Hixie/flutter,Hixie/flutter,flutter/flutter,Hixie/flutter,Hixie/flutter,cbracken/flutter,cbracken/flutter,Hixie/flutter,tvolkert/flutter,flutter/flutter,Hixie/flutter,flutter/flutter,flutter/flutter,tvolkert/flutter,cbracken/flutter,flutter/flutter,tvolkert/flutter,Hixie/flutter,cbracken/flutter,cbracken/flutter,flutter/flutter,cbracken/flutter,cbracken/flutter,flutter/flutter,cbracken/flutter,tvolkert/flutter,cbracken/flutter,tvolkert/flutter,cbracken/flutter,tvolkert/flutter,tvolkert/flutter,Hixie/flutter,flutter/flutter