[PATCH] Move koshei handlers to the role