Kill start/finish Firing.

@bug W-1652120@

@rev eric.anderson@
Merging origin/goliver/master-pending-no-finish-firing into master