Moved to the handlers package instead.