* Revert "Roll engine to 6473f1b106485cb0b4ea569af383173daeef8895 (#16032)"

This reverts commit 844ced01.

* Revert "Let travis test archiving per commit too (#16004)"

This reverts commit df5905f3.