Readded before submit handler which was moved to *_kayak. Is it needed at all?