Revert "7/8 first"

This reverts commit 025b98eabbd99d02951e1389c59ea12986914231.