3x8_restore-master (#722)

This reverts commit 40e753df, reversing
changes made to 05e569bf.
18 jobs for master