Revert "Revert "commit first""

This reverts commit 96aa4b2001887959b011f702557437456cd8d6cb.