Reverting this; we don't want to enlist the handler, by default