Trying to add the handler back in.
Fixes following SDK rebase.