Trying to add the handler back in.