Revert "Revert "Kickstart tweak for 1.0.7""

This reverts commit 7dcdc348f5ac8c0d5ae73deb880606233bf54d10.