thin restart fails because 'daemons' gem steals HUP signal

I am running
thin (1.3.1)
daemons (1.1.5)
on OS X. The bug should be cross-platform

The problem is that daemonized thin server restart is borked. Restart times out, uses kill instead. See attached file for sample session.

Why does it happen:
Thin uses 'HUP' signal to restart. Signal is set in:
server.rb:setup_signals > trap('HUP') { restart }

When thin calls daemons gem to daemonize, the gem removes HUP handler
daemonize.rb:220 > trap 'SIGHUP', 'IGNORE'

What happens then?

You run thin restart, it sends HUP signal, removes the pid file, waits for restart. The daemonized server does not trap the signal, because trap has been remove. Caller times out waiting for new pid file, sends KILL which works.

My personal development workaround is to hack daemons gem. I hope this is fixed before I push to production.

Fix:
In thin, you could reset the trap after daemonize, but I did not see the clean code path to do this, so no patch.