Revert back to the default stop functionality of SIGKILL after timeout

After careful discussion we decided we are not happy with the breaking change and will be making this configurable at the daemon level for users that do not want it to be sigkilled.